Fix the allocation for the toggle button so that it actually shows up in

Mon Feb 23 02:26:15 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the
	allocation for the toggle button so that it actually shows up
	in LTR list mode.

	* gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column):
	* gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column):
	* gtk/gtkcombobox.c (gtk_combo_box_set_wrap_width): Add
	notification, and avoid excessive relayouting.

diff --git a/ChangeLog b/ChangeLog
index 3fde72f9b827475862887bea0b13c8eb0de240eb..553349d30775dade0b895fa041fe67300063b7ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Mon Feb 23 01:56:09 2004  Matthias Clasen  <maclas@gmx.de>
+Mon Feb 23 02:26:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the 
+       allocation for the toggle button so that it actually shows up 
+       in LTR list mode.
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): 
        * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3fde72f9b827475862887bea0b13c8eb0de240eb..553349d30775dade0b895fa041fe67300063b7ce 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,8 @@
-Mon Feb 23 01:56:09 2004  Matthias Clasen  <maclas@gmx.de>
+Mon Feb 23 02:26:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the 
+       allocation for the toggle button so that it actually shows up 
+       in LTR list mode.
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): 
        * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3fde72f9b827475862887bea0b13c8eb0de240eb..553349d30775dade0b895fa041fe67300063b7ce 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,4 +1,8 @@
-Mon Feb 23 01:56:09 2004  Matthias Clasen  <maclas@gmx.de>
+Mon Feb 23 02:26:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the 
+       allocation for the toggle button so that it actually shows up 
+       in LTR list mode.
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): 
        * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3fde72f9b827475862887bea0b13c8eb0de240eb..553349d30775dade0b895fa041fe67300063b7ce 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,4 +1,8 @@
-Mon Feb 23 01:56:09 2004  Matthias Clasen  <maclas@gmx.de>
+Mon Feb 23 02:26:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the 
+       allocation for the toggle button so that it actually shows up 
+       in LTR list mode.
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): 
        * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3fde72f9b827475862887bea0b13c8eb0de240eb..553349d30775dade0b895fa041fe67300063b7ce 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,4 +1,8 @@
-Mon Feb 23 01:56:09 2004  Matthias Clasen  <maclas@gmx.de>
+Mon Feb 23 02:26:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the 
+       allocation for the toggle button so that it actually shows up 
+       in LTR list mode.
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): 
        * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 4e22b247e38fb0a685bb94a00503775a3fd4f4bf..755159c6db8c343d9c927ea6b37ead4b8f751730 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1096,7 +1096,7 @@ gtk_combo_box_size_allocate (GtkWidget     *widget,
       if (is_rtl)
         child.x = allocation->x;
       else
-        child.x += allocation->x + allocation->width - req.width;
+        child.x = allocation->x + allocation->width - req.width;
       child.y = allocation->y;
       child.width = req.width;
       child.height = allocation->height;